Revise RSpec tests - 76 passing - 6 pending.