Eliminate type warnings in Problem4/Experiment.java
Add tests for PredicateMakers
Clean up code in PredicateMaker implementations