add some tests, modify config