Update AMD tests; now works with Jons demo
Update demo