adds more tests according to Wikipedia