FIX: Tests for tutorial klaus