reverted commenting out tests