added some new tests and fixed existing ones