Tidied up, removing heredoc
Fixed issue with being unable to mock a special internal class multiple times