added repository overriding, amd overriding tests