Adding more tests, DRYing up errors