GTest now working. Need to refactor code