Updated unittests for e81f717a