make test use same output format as random tests
moved tests into better locations