Fixed the client tests failing because of the new templates