Big Update. Tests Working