Remove some test code from trunk as it doesn't need to be here. I'm just