improve tests
tidy