Some test modifications
Update to article