Add checkpoints to test server level. AH-282