condense test user fixtures, remove unused tests