Remove tests, fix later