Tidy up project and get the demo and tests working with the framework