Remove pointer tests. Add swapable matrices
Fix merge conflicts