fix a test
abandon deprecated method
abandon deprecated method
abandon deprecated method
abandon deprecated method
abandon deprecated method
abandon deprecated method
abandon deprecated method
rename some things and tidy up