unit and performance test added