Re-enabling most tests