Black box tests - tidy up/forgotten nits