Ignored some tests / Refactored names (2)