Replace constructors with factories
Use newer expectation syntax in rspec tests