Some fixes and a bunch of TODOs.
Move configuration section before writing test sections, add content where needed