fixup a few more items, need to generalize test user and tests and then ready for rc2 I think