issue_3: Refactored test suite to make life easier