Additional test improvements (less encoding issue).