Everything works
Fixed the tests