completed as many tests as I could
Merge branch 'development' of github.com:alevsxm/Team-Doge into development