Merged & fixed test for #4