add go back links
fix four tests