split up tests and removed some old code