Add additional unit and integration tests