Continued Refactoring of tests