test fixes for Highwire and Landes