Added guard, and changed how tests work