Issue #2: Adding tests based on 2 criteria