Todo resolved, unit test added