AUI-1550

Broke down tests