More flaky test fixes

Remove default cases in select statements.
Correct error message expectation.

This is the same root cause as #211.