Adds more basic tests