Added file/line info to properties for config debugging
Some test cleanup