Update tests to work with new packet structure