Can you please make sure this class has some unit tests?