Fixed some old tests to point at the right files
Protected all loops with a different first iteration (i.e. with a for loop with an initialisation of i++).
Other sanity checks on predicate functions.