Changed player test to reflect updated player. Unit tests and slave
branches are now merged into master branch