Test fixes and doc updates