Fix test timer.
Remove code that was fixed in compat.
[#1737] Fix test timer for skipped tests.
Merge master.
Update to latest branches and dependencies.