Added two more tests

Probably wait until other test is passing before merging.