Updated unit tests to work with server classes as data