LUN-600 -- added unit tests