Make new tests into unit tests, revert old tests.