Patch 3

Test written for issue #1830 I'm still a bit new to all this stuff, so I'm sorry if these tests are poorly written or don't work at all! Let me know what I can do to improve them and I'd be glad to.