Getting towards a proper test setup