Update to test specs and minor refactoring
Refactored code to be little more wordy and cleaner, working on first steps to move away from the single user model and allow multiple users subscribe to or add shows