Throw, throw, throw your boat...

Refactored tests