Merge in data_nocollide branch. Fixes #6968, improves unit testing framework checks...