improve core specs #1347