More tests

Start adding some more tests.