Integration: empty element, TEST/NOTEST, output subdirs
Merge pull request #5 from elenasa/master

Integration: empty element, TEST/NOTEST, output subdirs