refactor all test checking to DataBundle