Restore commented out tests