GBP tests: fixes for unnecessary mocking, method naming and other