Fixed tests for #95 and #91