Update API Unit Tests for #999