revert change for ubuntu and fix test user spec tests

revert change for ubuntu made during AIX work and fix test user spec tests