Cleanup finder criteria
Update to JUnit test case