Mild refactor to qa assets