Fixed tests for Linux
Added phone client
Refactor
Added some tests
Minor fixes
Modified tests