Added missing testing and some missing JavaDoc

Change-Id: I182e05229e15e2bd5d3a8c5e8eb79230c6e02f47