Gradually get towards the final fixed set of tests