Changes made from code review

Broke down the large test method.