Minor test fixes

Test fixes and better error message too