While working on doubleshot, this clicked. Adding tests properly now =)
Resolved undefined issues but some tests are failing