Fixing tests for #18