Commented out the GTest things for now, will require more work