Make automated tests easier