add test cases, removed some initialization, about to change things to use PCplus1