Restore tests
Merge pull request #436 from tlvince/refactor/tests

Restore tests