Tweak for to make it work for tests