rpsec refactor 1
refactor rpsec tests 2
refactor rspec tests 2