Solved 002 and unittest