fixed unit tests after source design