Solved 004 and unittest