Fixed #6: Separation of unit and integration tests