- working on the tests, fixed a couple but not sure if they are right.