added scrample tests
refactor and fixed packet numbering
updated TODO