Some tests
Removed some old code
Changed testing times