Refactor suite to fix bitrot from obscured test