Test improvement

Added offload tests where they missed and some minor tweaking.
Refreshed TODO list