Maybe this test should be extended by other? Similar way that it's done for gateway classes.