fix domain and core tests