added back test import that IntelliJ pulled off
added some more integration tests for GMAVENPLUS-17