fix ECheckType spacing
initial tests
Refactor all the things