adding remaining tests for AGPUSH-265