Fixed the refactor bug
fixed all the rspec bug