Modification to test this class