Fixed 2 broken tests (time related)