Fixing broken test, improving example