Refactored for new tests.
fixed misspelling, finished moving things around
Runs waterline tests