flush out more db parsing/add tests