Reverting grid_facade testing code changes