Modify test routines for final test