Refactored
Lint
Lint
Fixed test cmake file
CMakeFiles