Updates to sample datasets, functional tests fixed