Adjust test mod
Add Bgr and clean up other files from commented code