Merge in some test file fixes

Some work has been done converting unit tests into Rspec in the master branch. See what happens in the Git branch.