Finish demo and test in marketplace