Removing brittle tests that break the build