Applied code style fixes suggested by Scrutinizer.
Improved unit tests, renamed client class.