Solved 007 and unittest