added detection of @Data and @Immutable objects
fixed test suite