Remove tests again until I have more time to work on them