Rename methods etc so that they don't conflict with other tests