Users test cleaned (with little improvements)