Moved Control code from test state to player controls