Rewritten tests using more configuration and modularity