EST-241: updated contract test and removed obsolete @Discriminator annotations