Merge "(Automated Tests) Ensure we pick up all the tests" into devel/master