test structure refactoring
some fixes and comment crawling