moved tests. TODO: write regression tests for moving tests