Separate unit tests and integration tests; still need to write the unit tests