Add Guard and more testing