Re-enabled tests that were incorrectly disabled