Remove irrelevant tests
Move stuff