Improve inbox tests