Remove unused code from tests
Remove redundant constructor
Renaming poorly-named function
Fixed test that wasn't testing anything
Removing negation from test
Tidy-up conditionals