changes!!! and more tests (that fail :))