added changes for full test computation