Lots more tests

Added lots more tests.