Tests now detect optional modules and only exclude optional files
if optional module dependencies are not met.
Also major indent cleanup
r=timeless