closes #2230

and I actually tested every single one. go me!