Refactored tests and sketched out some new tests