Fix dbServise and tests