Reviewed code and made a few changes to functional tests descriptions.