Broke up test class into smaller test units