Tidy up tests by using expect in
Can now increment max-change when desire changes more than max amount
Use default value in map lookup to avoid need for min-desire and
max-desire functions
Added per-motivation max change delta values