more tests, fix hydromet output