Clarified design, added unit tests description