Updating documentation machinery
Fix failing test and makefile alignment