ECL-282 - add aspect test
ECL-337 - finish switch in case failure