Fix metric tests