Some cleanup in Reader, added more testcases, added more advanced testing, added toString() to solvers, renamed MatsNaive to Naive