Storeable task by Kamil Talipov, 295

Final fix - tests improved.