Test Stonewall: More Tests added