Removed handle_nan method, as it isn't really useful
More specs and improvements to the metrics