Applied some enhancements suggested by Aslak + moved TestBenchExtension to separate library