Adding tests from ppi v1