Fixed to resolve tests