added separate settings for tests, more cases tested