Rewrite config and test