Fixed up unnessesary logic
Changed tests so that they have 100% coverage