Simplify status-setting logic and add test

Signed-off-by: Zack Cerza <zack.cerza@inktank.com>