Test refactor

Refactored tests to use test helpers to make our lives easier writing tests ;)