roll in new initialise tests from dev branch