added more checks for up to phase 2
Merge branch 'master' of https://github.com/svjharris/131-ProjI-Tests
Merge branch 'master' of https://github.com/svjharris/131-ProjI-Tests