Restored commented out tests