BVTCK-32

Adding more tests, re-enabling tests for fixes in the RI