changed fixtures so they can be shared on mock mode
changed fixtures so they can be shared on mock mode