Added more tests (as subtests)