Integrated wiredep into demo and test