improve tests
extract