Minor Fixes ~ JUnit implementations