Adding time checks to testing script
Merge branch 'testing' into working