updated dataset. organized tests