AUI-1550

Break into smaller tests