corrected program + better test schema + setup added