Dir6 commenting and unit tests