added rest of tests. now we kinda... pass the tests!