Expand coverage of e2e tests

[carlosra0345]

So far, e2e tests only cover a small rnage of posible configurations. Expand the existing e2e testing suite to include a wider range of configurations.