Removed really old test, fixed a test that slightly broken