Little bit of test and doc cleanup.