Merge pull request #909 from steventlamb/topic/use_liveservertestcase

Topic/use liveservertestcase