more tests and set datamake script to use legacy