Lots of reworking to make the test cleint work awesomely.