moved factory_girl_rails to test group
fixed conflict with factory_girl gem, adjusted factory paths
factorygirl set up
client tests adjusted, more to follow