Added time dependency in tests where necessary