Improve logic ordering. Allow for conditional ignoring of tests.