Doc cleanup and new tests