Bugfix client spec
Bugfix bad class name
More bugfixes