- Adapted the code to the new BinaryFinder interface;
- Test scope for JUnit.