More tweaks to fix tests and add more output to the non-public attribute scanner