Change test names to be consistent with code
Remove duplication in tests
Error on AA definition