Add main client and first test