Wrote more mac_user tests, found and fixed bug