Classes to test new BOM checking code
+ Merged BOM checking improvements