Some JavaDoc + UnitTests