LUN-1102 -- finish unit test