More test extentions
refactoring