Modify unit tests to comply with AGJS-158