First commit adds tests, second cleans up the code.
:thumbsup: Tested and approved
Pull-Request has been merged by hguemar
First commit adds tests, second cleans up the code.