Task #0080: Work on the functionality test + Bug #0081: Main loop change from for to while.