Almost all tests converted to RSpec