preliminary tests set up and minor changes elsewhere