Update JUnit tests to cope with new metric implementation