Minor refactoring, Articles copyright should contains the current year.  Removing a class and agruping test