Few new tests, some notes too