Adds more tests