christoph: switch + 2011 + test