extended user rest, fixes for tests