2015 Test Fixes

Requires Cherry Picking Into:
- [ ] master

Please Review:
- [x] @Randy-Ma 
- [x] @riteshchandawar