More testing
Repair tests, add linktext