Renamed some lingering unit test files and disabled the demo unit tests.