Use rspec for new tests.
Enhancements to specs, collection & site