Refactored and wrote more mac_user integration tests