newer ruby hash syntax
little things
tidy up factories spec a bit
follow the rules