Bunch of new tests
Bug fixes