Update JavaDoc, use contants in unit test