Fixed some tests and added reporttest to ignore (encoding problem)
Merge