I removed all test parameters and associated conditionals.