Forgot couple of changes for fixing unit tests