Revert the read_only view variable + test refactoring