Cosmetic tweaks and attribute removal updates in tests.
Adopts the current rspec paradigm.