Minor fixes for rest compile and UT errors in test/resources/../javadoc folder #388