Removed old tests, fixed a bunch of things