added more tests
merge