Made a tentative start re adding property tests