DC21-MISC: Add new tests to increase coverage