Removed conflicting header files, fixed live_test which seems to be partially working