Refactor tests into unit tests and integration tests (so we can quickly run unit tests)