fixed test dists to not include apache lib, client in server, server in
client