Added users, hosts and a new more advanced test plan