Fixed tests and made them today-independent