backport updates to parent test class