#24 test added
#24 more tests
implements and closes #24