Redone tests for new feature introduced by #8