Fixes # .

Changes Proposed in this Pull Request:
-
-
-

I have written tests for:

- [ ] New features introduced
- [ ] Bugs fixed
- [ ] Neither (I'm just enhancing tests!)

@jazzpi @LongLiveCHIEF