Refactoring \ testing related changes