Better tests for Features