Merge pull request #205 from pisaychuk/TestName

'Test' added to class name
deprecated and unused methods removed
remove unused import
code formatting, clean-up unused code
code formatting