Changes in own test-bench