Continued with debugging effort.
Added additional test cases.