Fixes unit test breaks