Moved test to specific class.
Fixed minor bug.
Merge branch 'master' of https://github.com/Ramqvist/shrdlite-template