Added tests for previous QC values
Refactor assignment to take place on one line