Re-organise and extend the current test setup