Fix tests, need to update KRE next to fix rest of tests