Move tests to improve guard usage.