Merge remote-tracking branch 'robworth/develop' into features/124-DB-Specialty-Setup

Fixed the testcase for EyeCheckupDaoTest&FootCheckupDaoTest