fix test path (again...)
remove useless code
change default layout to fit CdC
add sourceEncoding property