Updated PlayerTest with some tests - so far all run OK. Made some small
changes to other files based on these tests.