Minor test corrections