Passing a few more tests...woot