more tests, better setup