Few text changes and test linking system