Worked on Testing

Work Credit @RNOrlando
Merge branch 'dpseaman-DnD_testing' of https://github.com/SixAppeal/wpi-suite.git into dpseaman-DnD_testing
Fixed Merge Errors