Added P/N test cases, fixed last 2 cases.