Added extra items to rawdata, tests