Feature promotion bug

fixing bug and reinforcing fix with unit tests