fix tests for jlsullivans fixes