Last testing framework refactor.

    * Added framework
    * Fixed 'make test' target