Cleanup of Array test
Broke out color options