Modularised the tests