test update and tiny code fixes