test fixes, timezone conversion opts and fixes