minor configuration changes
some tests