Prerequisites for extensive tests

- Can be merged once test runs succeed.