BLK-87 Simplifies duplicate post logic and adds a test

Signed-off-by: Oren Leiman <oleiman@neutral.io>