Removed some test leftovers from clients and cleaned up tests