Added new expected values, upgraded readability.