Removed tests that need a separate fix