Got a couple of tests working