Fixed few bugs caused by the transition to Play object, seems like we can use more untitest to check queen functionality.