Fixed delivery timing paradigm according to teacher's vision & updated
tests accordingly.