Minor refactoring and add reference to the inspiration of the test bench.