Did some cleaning of test.rb, removal of old useless metrics