Removed old files, fixed a couple of tests