Switch to looking up constants by class name rather than class
Added liveness tests