Revert "Revert "Merge branch 'test' of https://github.com/scarious/frisbee into test""

This reverts commit 2673862020ef647846b311cc0c0c8a8b8e7a293c.