timezone conversion tests
timezone conversion: more unit tests

and code reorganization