Adding Unit tests and console client