Fixes incorrect (numeric) metric names on NC

Fixes EUCA-5718
fixed date conversion (was off by 1 hr), improved test for it