Improved testing/demo tools