enhance tests.
refactor messages in PlayState to be set correctly