major fixes, tmpUser for test