Fixed tests
Started plugins tests