add more test
finalizing cs + imports + etc...