Clean up branch for merge

Disable new test until we “fix” it (make it break)