Modified synthetic_data function to use solver object
Minor change to testing error message
Merge remote-tracking branch 'jmuhlich/master'