Updated docu
Added required metrics
Added test