There should be a new structure found underground called an underground laboratory. It's basically an abandoned area with "experiments" including zombie villagers trapped in cages, potion...
This is a really cool idea! But I think it should be kind of rare. That will make finding a castle even more special and cool.