BuildingKitServiceTest corrections