Added tests and changed imports plus reverted one change#6

EternaleapFromPit wants to merge 3 commits intoZigistry:mainZigistry/Zigp:mainfrom

EternaleapFromPit:tests_and_importsEternaleapFromPit/Zigp:tests_and_importsCopy head branch name to clipboard