Fixed failing Weekday expression. Fixed tests.