Re-refactored RSpec tests.  All test passing.