unit test fix take 2