Added new tests, removed deprecated stuff