restructuring test and added some for basket