Pre-test properties are used into the Test property calculation

Closes #425