Replaced with test code