Corrected test cases N12-N16 after Randy's review.
Added missing test case P9.