Made some changes to only choice rule and added tests