fix to unit test errors