Refactor tests
Remove Mat struct