[~] Cleaned up cmake
[~] simplified test