Fix tests
Fixed up some bad terms
Updated roadmap