Demo cleanup + test coverage