Comment fix
Tools fix
Tools fos fix
Covering TestComment still gives nullPointers at dbtesting