Ignored tests fixed.
refactoring continues....