Fix dataset metrics POR-2472 and add manual full integration test