Adding a test and avoiding some warning caused by generic classes
useless merge...