Added some extra unit test cases.
Implemented P08.