Final commit, includes the original rspec tests.