Fix more of dem unit tests