Simple test, client refactor, enabler etc...