Fixed all of it
Fixed the tests