Upgrade Jayway 0.9.1
Minor clean up
Use collect instead of filter+map