test fixes and skyql verification