Fixed some End-to-End tests, added new tests
Some minor fixes