Test case fixes
Add missing cam filename test
Bug fixes
Performance improvements
Remove unused directive
Performance changes