More working up of tests