Further revise tests and associated functionality