finished some tests for the Play class
fixed my own conflicts :)