Refactored tests, removed dead code
Merge pull request #51 from NosotrosNueces/better-tests

Refactored tests, removed dead code