Doco

Change-Id: I855a3f0bec09ce17088c164785c460a52d58549a
Unit tests

Change-Id: If4de7bdfcaa514c0a62262368ed5f2034656e0b1