Refactor trap-user tests