Added more tests, generalized test configuration.