Changed subject to class for testing purposes