Fixed the tests and got something kinda working