Add test material & little modifications