Ported demo style changes to test