Refining unit tests, a bit more implementation FEND-897