Added bunch more tests.