AES: CS changes to unit tests