reverted some templating changes, added generate_test_data functionality