fixed unit tests #6