Fixed syntax errors in previous test and update dbservice test cases