Many tests and modifications for new features