Add more basic tests