#35 - Test refactor