Updates for to fix for tests