Added additional tests for selection criteria