Minor test/language fixes