Improve code and rewrite tests