partial move of test to live.