Sure, let me rename those classes.
I think I'm also removing the mockpay stuff from this test as it is not needed.