Shrinked datatypes to useful part
Organize imports after deletion rage
Corrected testcase