Added loads more tests.