Update ignore filtering to reflect new structure
Fix compile err with tests & examples
Remove file that was never meant to be included