Added correct test functionality (hopefully)
Merge branch 'master' of https://github.com/MisterPuddin/clean-code