Trying to resolve testing issues still