Bugfix, timing in tests