Fix handling of clockwise shell (and enable test)