Remove unused test files
Change referenced material syntax to not need to change class of instance