moved tests in prep for adding scenario tests
test uncovered problems in sync; also went ahead and fixed the --checkout output