Updated Testing for Classes