Extracted "PlaceToken" and added more tests

TDD as you meant it..