Use correct output directory for comparison
Perform setup and cleanup in correct order and simplify code
Perform time-setting in test rather than use delays which slow down build
Split test into individual methods to allow tracking of multiple failures