Switched tests to use calendar instead of date