Rest tests improvement