Use Option for client actor reference instead of null
Prep for first attempt at actor testing
Refactor actor construction (cake) for testability