tests, one is still failing - lets solve it tomorrow
merge conflicts