Remove @Test (again) until tests are fully functional