Rewrite tests with Test::More