Removed cruft, refactored happy path tests