BVTCK-39

Fixing some wrong test setups missed in previous changes and disabling tests related to https://hibernate.onjira.com/browse/BVTCK-40