CSV result; added test; TODOs removal