Tidy comments
Remaining tests