#gklst fixed failing unit tests