Improve term file and conduct tests #11