Fixing tests for #51