Synchronise tests with branch: develop