updated test and schema