Cleaned the solution with gtest samples being run successfully.