Update unit tests #71 #68