Adding more tests, and a structure for FPTP.