Solved 006 and unittest