Change name classes and add new tests