Add some tests and Code clean up, lintify at 40%
Code clean up, lintify at 100% and test note