BVTCK-39 Adding/fixing assertion for default executable types