finished adding all testing for demo