*NO_CODE_CHANGE* cosmetic changes on test files and new test files added (implementing tests for these files is not finished yet - it at the beginning...)