Fixed up test6 and added test7 (db fsm coverage)
did a merge