Re-added some tests that where temporarily disabled.