Refining unit tests and more implementation FEND-897