Added hooks and testrunner