Updated tests to the latest version from #37