Refactor tests to not require opening guidance each time and be more linear