Minor test fixes related to #267