Rspec tools and misc cleanup