A few small tests working - still need more tests.