test updated, unnecessary code removed, qschecker