cleanup
CHO: updating tests to live data