Some corrections, more tests