I'll refactor these at some point this weekend, I might even make a helper to do it so it can be used to test 3rd party ones.