add tests to get coverage up to 90%
refactor PlayerModule

simplified and removed redundant code