Remove unnecessary tests
Change wording for tests
Refactor method definitions on prototype to be more DRY