Split up the unit tests and integration to be more explicit