Make rules for integ and e2e tests

Closes #1706