Better tests for new feature