Fixed Tests/Classes Various