Simplified the waiting ofr update loop implementation.
Created comprehensive UTs for this loop and added an emergency exit when
a not expected state/message pair would lead to an endless loop.
Removed amount check: not necessary because this state is handled with
the message type itself.
Little method extractions for simplification or update wait loop.