added new tests and modified old ones