Added more basic tests.