Add few more basic tests