Clean by pattern and attribute unit tests fixed.