Re-added special test. Soeren: DO NOT REMOVE