Modify `make test` target to call two separate test targets

[apfong]

Currently running make test will call an integration_test target, which executes both our unit tests and integration test which can be a little confusing. We need to split up integration_test into unit_tests and integration_test and have the test target call these new targets.