Test Stonewall: Added more JUnit tests