Fixed typo on variable. Added ClientTest to have client specific tests.