tiny fixes for recent nightly update
tiny test adjustments