added a few tests
merge