Fix tests according to latest code.
Add some useful comments about tests