this should fix unittest failure
some updates