Added start of Unit testing and Client code