Fix for the unit tests #97