Some test-code removed