Removed some not-tests
Updated references to both metus libraries