Most RSpec tests fixed except 2 Solar tests