Ready/97

Also moves test for #89 into casper.