fix specs to handle heirarchy changes