AMEC-2129 unit tests