Everything works

extra tests optimization