Started to fix tests
Merge branch 'development' of https://github.com/steckums/HockeyChampBelt.git