Fixes Matrix tests