more tests, extracted classes