refactored and added few tests in approve RnR Through API