Removing the ACME demo, and adding tests