This also means that class tests are now passing, except for private variables, which are not that important.