Improving tests

Trying to improve my tests so I can avoid making a brand new 'server'
for every test function.  Also working on a cleaner method of handing my
'server' and my 'clients'