Demo Updates

Changed some names of tests to be more consistent with function. Added
separation of demos