Fixed up doc changes and test