Add tests

This PR adds more tests.