Fixed encoding issues

'ant test' was successful