Made all tests work
More stuff