added more unit tests and started using factories rather than fixtures BB-12