Removed last tracks of matrix package, wrote some new tests.