Make the test constructor smarter.