Move test code around
2 files changed