Move away from setup that uses multiple fixtures in a before each. Di…

…rectly invoke the setup as fixture in each test - this is faster and cleaner