better-than-before

Better setup for tests