Move integration tests into main_test suite

-Go 1.3 changes the way tests are built