Got a couple more tests passing