included more tests
merged