Additional unit and integration tests