Solved 005 and unittest