More tests and a wood background
Merged package.json (I hope)