Removed obsolete usage of @entity annotation in some tests