fixing unit test breaks