Commit dcde5720424961f526e8c070b7d99191d7ef75c1

Edward Thomson 2015-11-09T08:23:27

merge tests: move expected data into own file