CC-17 Updated unit tests and docs