Added test diagrams and refactoring of driver verifier.