Tests improved but not final yet!