CLIMATE-768 - Fix failing tests in test_dap.py. Add extra logic to dap.py to check...