#86 fixing some unit tests