Fix raw generics.
Remove metrics tests.