Revamp tests suites