Version fix
TZ fix + tests
CLI tests