Add demo and reporter tests