Avoid error on version lookup; remove unused method temporary variables; allow test class to be run from hierarchy.