playerTest, enemyTest fixes
Merge remote-tracking branch 'origin/CallebergBranch'