Issue #11 Tests refactored for clarity