More tests

Added more tests