Update issue #36 with more tests.
 - added P2