Improved test setup a bit