Move some tests to better places