Added more functional tests (dataset forms)