Filled NeededData_Load and updated unittests