Add all the other tests
Removed old debug code