unfinished but keep moving
Merge branch 'refactor_RSpec'