SpaceDataSource test and bug fixes