Refactored for #33, normalising in prepare. Reference results.