Some unit tests for the improvements made today
Fix for unit tests compile after last commit
Reduced unit code duplication
Basic unit tests for a very simple file
Further expansion of unit tests for recently added features/improvements
Fix for two unit test failures