Fix class name and add unit tests