Added more basic tests