Finishing up Term service and tests