Tests now all use guard correctly