REVIEW-1699 Switched back the test. Spockified the test and busted the class into smaller pieces to improve testing.