Re-enable tests for working functionality