Added Unit tests for while, fixed 2 test cases.
TODO: Still some test cases not set right expectation