fixes for tests failing in different timezone