Identify and implement missing unit tests for #145

Follow-up issue to !174 (merged) and #145 (closed)