Clean up and unify TypedItsATrapTest