Minor changes for make check and test timeout
Merge branch 'Project1-Automated-Testing-Coverage'