move demo data from client to server, modify code for tests