Added Amop to the client unit tests