Work continue for #6 and rewrite unit test