Fixed merging, made test useful
Added missing method documentation