Change struct to class for tests