Intial conversion of client to unittest format