admin removed from companies
tests changed for companies
user edit modified
users merge conflict solved
Tests updated for admin modifications