add tests for PlayerController
add mock file
resolve merge