US05: Unit test, update documentatio of methods