moved test-specific configs into tests
more descriptive test names