christoph: niko + switch + test