Renamed Test file made other fixes