Updated Hops, removed test template