Optimise a little for probability of occurrence
Removed redundant test data file