Re-enabling tests