add factory girl...tests sort of work now (the ones that fail do so because of connection errors)