Improve LIVETEST, not perfect yet