cleaned up tests, refactored out live data into a seperate polling mode