Forgotten test & view update
Merge branch 'master' of https://github.com/Marvyn89/The-G.O.A.T