Rewrite tests + 0.0.7