Committing minor testing updates before branching to new branch
Fixed unnamespaced code in UI and made minor changes to how some code was referencing other parts of the namespace