NX-526: More UT fixes

The DefaultTimelineTest methods when run together are
failing, but when run one by one (ie. in IDE) they
pass.