Just a bit for checkmating
Some fixes to tests