more dev test fixes