enhanced test + runtime updates