The original PR for #81 and #31 got merged before tests were added. So hence this separate issue is necessary.