bug #1600 - added timeline and tests