Changes in code structure for Tests