Partial fix for eztests. All but warn working correctly'