Don't assume time - fix tests