Ninja: Adjust cqlsh unit-tests for 2.1